bitkeeper revision 1.1159.1.475 (41b9efabAfHQClS6PJMUaGIogh-MMw)

sync w/ head.

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 9d097f80d5b54534f8dac357653c43ad932e58f8,6767868bd3a543c0d79f140ba01a366fde702588..dc428ab5013224ae15bf9a950533030522bcd790
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -62,12 -58,12 +62,13 @@@ tools/balloon/balloo
  tools/check/.*
  tools/libxc/xen/*
  tools/misc/miniterm/miniterm
 +tools/misc/xen_cpuperf
+ tools/misc/xenperf
  tools/vnet/gc
  tools/vnet/gc*/*
 -tools/vnet/vnet-module/.tmp_versions/*
 -tools/vnet/vnet-module/.*.cmd
  tools/vnet/vnet-module/*.ko
 +tools/vnet/vnet-module/.*.cmd
 +tools/vnet/vnet-module/.tmp_versions/*
  tools/vnet/vnet-module/vnet_module.mod.*
  tools/vnetd/vnetd
  tools/web-shutdown.tap

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/common.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/mm/hypervisor.c
index 23f1a50ab2ceb51dfef85f2f466bc8dd40f07699,81d0b8450c6a42e37f283408a01bb5ce8db00907..c6c7bafef918c6d69991b1f3c19c0cca81dbca65
--- 1/linux-2.6.9-xen-sparse/arch/xen/i386/mm/hypervisor.c
--- 2/linux-2.6.9-xen-sparse/arch/xen/i386/mm/hypervisor.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/mm/hypervisor.c
@@@ -35,7 -35,7 +35,8 @@@
  #include <asm/pgtable.h>
  #include <asm-xen/hypervisor.h>
  #include <asm-xen/multicall.h>
+ #include <asm-xen/balloon.h>
 +#include <linux/percpu.h>
  
  /*
   * This suffices to protect us if we ever move to SMP domains.

diff --cc linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
index c782becc7eb0907ec89f2cabcb8306b63ffb0c74,26731eff3130d751c2181d177c40b14ead76575e..1318fee4e30a60bbc0c4932ff2a07e4493ffe56d
--- 1/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
--- 2/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
@@@ -9,5 -9,4 +9,5 @@@ $(obj)/vmlinux.lds
  
  extra-y += vmlinux.lds
  
 -obj-y := ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o gnttab.o skbuff.o devmem.o
 +obj-y := ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o \
-            gnttab.o skbuff.o smp.o
++           gnttab.o skbuff.o devmem.o smp.o

diff --cc linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c
index af0e68c40b483e82db2f8746b49b9694001fb2bb,41d947bacfbc1204e575fccfd0901276365f3a58..0faf0a61b709066930ba27a7302b01bb1edebd98
--- 1/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c
--- 2/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c
@@@ -11,7 -11,7 +11,8 @@@
   */
  
  #include "common.h"
+ #include <asm-xen/balloon.h>
 +#include <asm-xen/evtchn.h>
  
  static void netif_page_release(struct page *page);
  static void netif_skb_release(struct sk_buff *skb);

diff --cc linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
Simple merge

diff --cc xen/arch/x86/memory.c
index ce001f76c896f063e443eeaaad785b2c0c8007f3,7cab825a4d397f581d3fdc22920e3b6155086a84..a350b06d3446be3bd4d2bfcf47d687771c9f9f2f
--- 1/xen/arch/x86/memory.c
--- 2/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@@ -1302,11 -1299,6 +1302,8 @@@ int do_mmu_update
      u32 type_info;
      domid_t domid;
  
-     perfc_incrc(calls_to_mmu_update); 
-     perfc_addc(num_page_updates, count);
- 
 +    LOCK_BIGLOCK(d);
 +
      cleanup_writable_pagetable(d, PTWR_CLEANUP_ACTIVE | PTWR_CLEANUP_INACTIVE);
  
      /*

diff --cc xen/arch/x86/x86_32/entry.S
index 4853f0533f62116dd3bb878b57affa5cbfc7a979,c85d84c649edc857370676be7d751e16e8282dbe..7a5bac7b915216cf807753cd73849b611c15e378
--- 1/xen/arch/x86/x86_32/entry.S
--- 2/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@@ -338,9 -338,10 +338,10 @@@ DBLFLT2:jmp   process_guest_exception_a
  
          ALIGN
  process_guest_exception_and_events:
 -        leal DOMAIN_trap_bounce(%ebx),%edx
 +        leal EDOMAIN_trap_bounce(%ebx),%edx
          testb $TBF_EXCEPTION,TRAPBOUNCE_flags(%edx)
          jz   test_all_events
+         cli  # create_bounce_frame needs CLI for pre-exceptions to work
          call create_bounce_frame
          jmp  test_all_events
  

diff --cc xen/common/dom0_ops.c
Simple merge

diff --cc xen/include/public/dom0_ops.h
Simple merge

diff --cc xen/include/public/xen.h
Simple merge